auto merge of #1039 : alexcrichton/cargo/update-rust, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 12 Dec 2014 04:28:56 +0000 (04:28 +0000)
committerbors <bors@rust-lang.org>
Fri, 12 Dec 2014 04:28:56 +0000 (04:28 +0000)

Trivial merge